Fixups to GtkStack

The GtkStack and GtkStackSwitcher code did not really
follow GTK+ conventions for includes. Fix that, and also
fix up a case of gpointer vs gpointer* confusion
in gtkstack.c.

diff --git a/gtk/gtkstack.h b/gtk/gtkstack.h
index 2c967aa67b3d020360619a93bd8a3237418ae539..82e527c4591eade1e7915c9ab990ef4eac893ef1 100644 (file)
--- a/gtk/gtkstack.h
+++ b/gtk/gtkstack.h
@@ -22,7 +22,7 @@
 #ifndef __GTK_STACK_H__
 #define __GTK_STACK_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkcontainer.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index 0aa6204f84a6e512bfee647438feda1474a239b9..8f683397cd73624a97ceae46a0fcb7096d056c0c 100644 (file)
--- a/gtk/gtkstackswitcher.c
+++ b/gtk/gtkstackswitcher.c
@@ -19,6 +19,9 @@
 
 #include "config.h"
 #include "gtkstackswitcher.h"
+#include "gtkradiobutton.h"
+#include "gtklabel.h"
+#include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
@@ -140,7 +143,7 @@ rebuild_child (GtkWidget   *self,
 }
 
 static void
-update_needs_attention (GtkWidget *widget, GtkWidget *button, gpointer *data)
+update_needs_attention (GtkWidget *widget, GtkWidget *button, gpointer data)
 {
   GtkContainer *container;
   gboolean needs_attention;

diff --git a/gtk/gtkstackswitcher.h b/gtk/gtkstackswitcher.h
index 402b83778c6cba856612812c969be503f2c0d8fa..093f85f0fbc440afcd47f54c8b1d2e272d7bfb0b 100644 (file)
--- a/gtk/gtkstackswitcher.h
+++ b/gtk/gtkstackswitcher.h
@@ -20,7 +20,8 @@
 #ifndef __GTK_STACK_SWITCHER_H__
 #define __GTK_STACK_SWITCHER_H__
 
-#include "gtkstack.h"
+#include <gtk/gtkbox.h>
+#include <gtk/gtkstack.h>
 
 G_BEGIN_DECLS